Merge "Revert "Revert "Add new recentchanges field rc_source to replace rc_type"""

diff --combined RELEASE-NOTES-1.22
index 00026bc,b8e9ecd..bf0c67b
--- 1/RELEASE-NOTES-1.22
--- 2/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@@ -64,7 -64,6 +64,7 @@@ production
  * (bug 54597) $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath, and
    $wgProxyMemcExpiry have been removed, along with the open proxy scanner
    script they were added for.
 +* Default value of $wgMaxShellMemory has been tripled (it's now 300 MB).
  
  === New features in 1.22 ===
  * (bug 44525) mediawiki.jqueryMsg can now parse (whitelisted) HTML elements and attributes.
@@@ -254,12 -253,6 +254,12 @@@
    output in a HTML comment.
  * The 'UnwatchArticle' and 'WatchArticle' hooks now support a Status object
    instead of just a boolean return value to abort the hook.
 +* Added a hook, SpecialWatchlistGetNonRevisionTypes, to allow extensions
 +  with custom recentchanges entries to hook into the Watchlist without 
 +  clobbering each other.
 +* A hidden, empty input field was added to the edit form, and any edit that fills
 +  it in will be rejected. This prevents against the simplest form of spambots.
 +  Previously in the "SimpleAntiSpam" extension by Ryan Schmidt.
  
  === Bug fixes in 1.22 ===
  * Disable Special:PasswordReset when $wgEnableEmail is false. Previously one
@@@ -419,6 -412,15 +419,15 @@@ changes to languages because of Bugzill
  * (bug 46751) Made Buryat (Russia) (буряад) (bxr) fallback to Russian.
  
  === Other changes in 1.22 ===
+ * The rc_type field in the recentchanges table has been superseded by a new
+   rc_source field.  The rc_source field is a string representation of the
+   change type where rc_type was a numeric constant.  This field is not yet
+   queried but will be in a future point release of 1.22.  
+ ** Utilize update.php to create and populate this new field.  On larger wiki's
+    which do not wish to update recentchanges table in one large update please
+    review the sql and comments in maintenance/archives/patch-rc_source.sql.
+ ** The rc_type field of recentchanges will be deprecated in a future point
+    release.
  * BREAKING CHANGE: Implementation of MediaWiki's JS and JSON value encoding
    has changed:
  ** MediaWiki no longer supports PHP installations in which the native JSON

diff --combined maintenance/tables.sql
index 61ffcf4,53068ea..af01a30
--- 1/maintenance/tables.sql
--- 2/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@@ -1062,6 -1062,10 +1062,10 @@@ CREATE TABLE /*_*/recentchanges 
    -- The type of change entry (RC_EDIT,RC_NEW,RC_LOG,RC_EXTERNAL)
    rc_type tinyint unsigned NOT NULL default 0,
  
+   -- The source of the change entry (replaces rc_type)
+   -- default of '' is temporary, needed for initial migration
+   rc_source varchar(16) binary not null default '',
+ 
    -- If the Recent Changes Patrol option is enabled,
    -- users may mark edits as having been reviewed to
    -- remove a warning flag on the RC list.
@@@ -1109,9 -1113,8 +1113,9 @@@ CREATE TABLE /*_*/watchlist 
    wl_namespace int NOT NULL default 0,
    wl_title varchar(255) binary NOT NULL default '',
  
 -  -- Timestamp when user was last sent a notification e-mail;
 -  -- cleared when the user visits the page.
 +  -- Timestamp used to send notification e-mails and show "updated since last visit" markers on
 +  -- history and recent changes / watchlist. Set to NULL when the user visits the latest revision
 +  -- of the page, which means that they should be sent an e-mail on the next change.
    wl_notificationtimestamp varbinary(14)
  
  ) /*$wgDBTableOptions*/;